From e2fcca4e60d6fc303b1eaa1b8a87701183172e47 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 1 Apr 2019 18:55:26 -0400
Subject: [PATCH] Rename debug settings to org.gtk.Settings.Debug4

This gives us the freedom to make changes without
interfering with GTK3.
---
 gtk/gtkwindow.c                                               | 4 ++--
 gtk/meson.build                                               | 2 +-
 ....Debug.gschema.xml => org.gtk.Settings.Debug4.gschema.xml} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename gtk/{org.gtk.Settings.Debug.gschema.xml => org.gtk.Settings.Debug4.gschema.xml} (91%)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fdead34439..6b6e9148ca 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9733,7 +9733,7 @@ inspector_keybinding_enabled (gboolean *warn)
   *warn = FALSE;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug",
+                                            "org.gtk.Settings.Debug4",
                                             TRUE);
 
   if (schema)
@@ -9755,7 +9755,7 @@ set_warn_again (gboolean warn)
   GSettings *settings;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug",
+                                            "org.gtk.Settings.Debug4",
                                             TRUE);
 
   if (schema)
diff --git a/gtk/meson.build b/gtk/meson.build
index 0acc012217..8fc6b91f0e 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -970,7 +970,7 @@ gtk_settings_schemas = [
   'org.gtk.Settings.FileChooser.gschema.xml',
   'org.gtk.Settings.ColorChooser.gschema.xml',
   'org.gtk.Settings.EmojiChooser.gschema.xml',
-  'org.gtk.Settings.Debug.gschema.xml',
+  'org.gtk.Settings.Debug4.gschema.xml',
 ]
 install_data(gtk_settings_schemas, install_dir: gtk_schemasdir)
 gnome.compile_schemas(depend_files: files(gtk_settings_schemas),
diff --git a/gtk/org.gtk.Settings.Debug.gschema.xml b/gtk/org.gtk.Settings.Debug4.gschema.xml
similarity index 91%
rename from gtk/org.gtk.Settings.Debug.gschema.xml
rename to gtk/org.gtk.Settings.Debug4.gschema.xml
index ab24ec6afc..6b8b1c2924 100644
--- a/gtk/org.gtk.Settings.Debug.gschema.xml
+++ b/gtk/org.gtk.Settings.Debug4.gschema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
 
-  <schema id='org.gtk.Settings.Debug' path='/org/gtk/settings/debug/'>
+  <schema id='org.gtk.Settings.Debug4' path='/org/gtk/settings/debug4/'>
     <key name='enable-inspector-keybinding' type='b'>
       <default>false</default>
       <summary>Enable inspector keybinding</summary>
-- 
2.30.2